[Entitlements] Integrate PluginsLoader with PolicyManager#117239
Merged
elasticsearchmachine merged 24 commits intoelastic:mainfrom Dec 5, 2024
Merged
Conversation
ldematte
added
>non-issue
:Core/Infra/Core
ldematte
commented
Nov 21, 2024
server/src/main/java/org/elasticsearch/plugins/PluginsLoader.java
Outdated
Show resolved
Hide resolved
ldematte
commented
Nov 21, 2024
server/src/main/java/org/elasticsearch/plugins/PluginsLoader.java
Outdated
Show resolved
Hide resolved
ldematte
commented
Nov 21, 2024
server/src/main/java/org/elasticsearch/plugins/PluginsLoader.java
Outdated
Show resolved
Hide resolved
…ate-plugin-loader-with-policy-manager
ldematte
changed the title
ldematte
added
auto-backport
Collaborator
|
Pinging @elastic/es-core-infra (Team:Core/Infra) |
…ate-plugin-loader-with-policy-manager
rjernst
reviewed
Dec 3, 2024
libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/PolicyManager.java
Outdated
Show resolved
Hide resolved
…ate-plugin-loader-with-policy-manager
…ate-plugin-loader-with-policy-manager
…r' of github.com:ldematte/elasticsearch into entitlements/integrate-plugin-loader-with-policy-manager
rjernst
approved these changes
Dec 4, 2024
Member
rjernst
left a comment
rjernst
left a comment
There was a problem hiding this comment.
This looks good for a first pass. As a followup, I think we need to do more work at initialization time. A lot of the mapping between module and entitlements is lazy and linear here, but it should be very quick hash lookups.
...src/main/java/org/elasticsearch/entitlement/runtime/api/ElasticsearchEntitlementChecker.java
Outdated
Show resolved
Hide resolved
|
|
||
| public void checkFlagEntitlement(Class<?> callerClass, FlagEntitlementType type) { | ||
| private static List<Entitlement> lookupEntitlementsForModule(Policy policy, String moduleName) { | ||
| for (int i = 0; i < policy.scopes.size(); ++i) { |
Member
There was a problem hiding this comment.
Why are we scanning module names, this could be a map right?
Contributor
Author
There was a problem hiding this comment.
The map is lazily created, but it could be done at initialization time instead. I will move that in a follow up.
prdoyle
reviewed
Dec 4, 2024
Contributor
prdoyle
left a comment
prdoyle
left a comment
There was a problem hiding this comment.
I am an unending source of nit picks.
libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/PolicyManager.java
Outdated
Show resolved
Hide resolved
libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/PolicyManager.java
Show resolved
Hide resolved
Contributor
Author
I agree, I will move the lazy map creation to initialization time in a followup today |
ldematte
added
the
auto-merge-without-approval
…ate-plugin-loader-with-policy-manager
…r' of github.com:ldematte/elasticsearch into entitlements/integrate-plugin-loader-with-policy-manager
ldematte
deleted the
entitlements/integrate-plugin-loader-with-policy-manager
branch
Collaborator
💚 Backport successful
|
ldematte
added a commit
to ldematte/elasticsearch
that referenced
this pull request
Dec 5, 2024
…7239) This PR expands `PolicyManager` to actually use `Policy` and `Entitlement` classes for checks, instead of hardcoding them. It also introduces a separate `PluginsResolver`, with a dedicated function to map a Class to a Plugin (name). `PluginsResolver` is initialized with data from `PluginsLoader`, and then its resolve function is used internally in `PolicyManager` to find a plugin policy (and then test against the entitlements declared in the policy).
elasticsearchmachine
pushed a commit
that referenced
this pull request
Dec 5, 2024
…118055) This PR expands `PolicyManager` to actually use `Policy` and `Entitlement` classes for checks, instead of hardcoding them. It also introduces a separate `PluginsResolver`, with a dedicated function to map a Class to a Plugin (name). `PluginsResolver` is initialized with data from `PluginsLoader`, and then its resolve function is used internally in `PolicyManager` to find a plugin policy (and then test against the entitlements declared in the policy).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR expands
PolicyManagerto actually usePolicyandEntitlementclasses for checks, instead of hardcoding them.It also introduces a separate
PluginsResolver, with a dedicated function to map a Class to a Plugin (name).PluginsResolveris initialized with data fromPluginsLoader, and then its resolve function is used internally inPolicyManagerto find a plugin policy (and then test against the entitlements declared in the policy).